Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate VPN and rp service to Docker Compose #3882

Merged
merged 9 commits into from
Oct 10, 2024

Conversation

shubhadapaithankar
Copy link
Collaborator

@shubhadapaithankar shubhadapaithankar commented Oct 3, 2024

Which issue this PR addresses:

Fixes : ARO-9501

What this PR does / why we need it:

This PR migrates the VPN, RP, and Portal services to Docker Compose, simplifying service management by containerizing them. The docker-compose.yml now orchestrates all three services. This migration makes the environment setup and service orchestration more efficient and maintainable, improving local development and CI/CD workflows.

Key Updates:

  • VPN Service: Managed via docker-compose.yml with an associated Dockerfile.vpn, allowing for easier configuration of the VPN through Docker Compose.
  • RP Service: Uses Dockerfile.ci-rp and is defined in docker-compose.yml, with the health checks in place to ensure proper operation.
  • Portal Service: Migrated to Docker Compose using docker-compose.yml, with secrets mounted, environment variables passed, and the necessary portal command defined to run the service correctly.
  • All services are fully containerized and share consistent configuration between local and pipeline environments.

Other Important Highlights:

  • Updated Azure DevOps pipeline to ensure correct variable definitions (REGISTRY, VERSION, LOCAL_ARO_RP_IMAGE, etc.).
  • Refactored the template to handle Docker authentication and image tagging/pushing with the correct use of VERSION.
  • Updated the Docker Compose file to consistently use pipeline variables for image names, tags, and build arguments.
  • Simplified Makefile by removing redundant variable definitions and ensuring compatibility with pipeline-defined variables.

Test plan for issue:

  • The VPN service was tested using Docker Compose.
  • Verified that the VPN connects successfully with the provided OpenVPN configuration.
  • The RP service was also tested in Docker Compose, ensuring it runs with proper health checks.
  • Health checks confirm that both the VPN and RP services are operational

Is there any documentation that needs to be updated for this PR?

N/A

How do you know this will function as expected in production?

@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci, e2e

SudoBrendan
SudoBrendan previously approved these changes Oct 9, 2024
slawande2
slawande2 previously approved these changes Oct 9, 2024
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link

Please rebase pull request.

@github-actions github-actions bot added the needs-rebase branch needs a rebase label Oct 10, 2024
@shubhadapaithankar shubhadapaithankar force-pushed the shubhadapaithankar/ARO-10901-vpn-service branch from 303370b to 0249c98 Compare October 10, 2024 18:20
@github-actions github-actions bot removed the needs-rebase branch needs a rebase label Oct 10, 2024
@shubhadapaithankar
Copy link
Collaborator Author

/azp run ci

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@SudoBrendan SudoBrendan merged commit 96637db into master Oct 10, 2024
19 checks passed
@shubhadapaithankar shubhadapaithankar deleted the shubhadapaithankar/ARO-10901-vpn-service branch October 11, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants